Implemented a debugging option

diff --git a/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/info.nib b/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/info.nib
index b190982ae83a1c389a4b848ddf7af641937a084d..e96c951ae3b597a0560217e312b980ae4b29f38f 100644 (file)
--- a/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/info.nib
+++ b/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/info.nib
@@ -11,10 +11,11 @@
        <string>283.0</string>
        <key>IBOpenObjects</key>
        <array>
-               <integer>229</integer>
                <integer>305</integer>
                <integer>29</integer>
+               <integer>678</integer>
                <integer>21</integer>
+               <integer>229</integer>
        </array>
        <key>IBSystem Version</key>
        <string>6R73</string>

diff --git a/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/objects.nib b/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/objects.nib
index a462acfe627e7205cbbebf8c170f2bcf9aed5c0d..8f8edf1d1c62a02e778c5ce8c8530054e5edb482 100644 (file)
Binary files a/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/objects.nib and b/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/objects.nib differ

diff --git a/gpsbabel/macgpsbabel/MacGPSBabel.applescript b/gpsbabel/macgpsbabel/MacGPSBabel.applescript
index 2c04825f8e0e6b22a92ade7fa25e466237798bd6..00d8853fcb0ba9279993592554daba45569b5288 100644 (file)
--- a/gpsbabel/macgpsbabel/MacGPSBabel.applescript
+++ b/gpsbabel/macgpsbabel/MacGPSBabel.applescript
@@ -74,7 +74,7 @@ on clicked theObject
                else if the title of current menu item of popup button "inPop" of window "MacGPSBabel" = "Select Input File Type" then
                        display dialog "Please select an input file type for the previous file before adding another file" buttons {"OK"} default button 1
                        return 0
-               else if item 1 of (the last item in fileList) is not equal to (contents of text field "inputFile" of window "MacGPSBabel") then
+               else if fileList is equal to {} or item 1 of (the last item in fileList) is not equal to (contents of text field "inputFile" of window "MacGPSBabel") then
                        set the end of fileList to {contents of text field "inputFile" of window "MacGPSBabel", contents of popup button "inPop" of window "MacGPSBabel"}
                end if
                my addFile()
@@ -82,14 +82,7 @@ on clicked theObject
        
        -- MAIN WINDOW - Clear button
        if theObject is the button "clearButton" of window "MacGPSBabel" then
-               set contents of text field "inputFile" of window "MacGPSBabel" to ""
-               set fileList to {}
-               set title of button "selectButton" of window "MacGPSBabel" to "Select File"
-               set enabled of button "sendButton" of window "MacGPSBabel" to false
-               set key equivalent of button "selectButton" of window "MacGPSBabel" to return
-               set enabled of button "clearButton" of window "MacGPSBabel" to false
-               set the contents of popup button "inPop" of window "MacGPSBabel" to 0
-               set the contents of popup button "outPop" of window "MacGPSBabel" to 0
+               my clearFiles()
        end if
        
        -- MAIN WINDOW - Send button
@@ -215,6 +208,26 @@ on clicked theObject
                        set contents of text field "polyFile" of window "filterWindow" to ""
                end if
        end if
+       
+       --debug mode
+       if theObject is the button "debugButton" of window "MacGPSBabel" then
+               if (visible of window "debugWindow") is false then
+                       set visible of window "debugWindow" to true
+               else
+                       set visible of window "debugWindow" to false
+               end if
+       end if
+       if theObject is the button "executeButton" of window "debugWindow" then
+               set theScript to contents of text field "debugInput" of window "debugWindow"
+               if theScript starts with "gpsbabel" then
+                       set thePath to quoted form of (POSIX path of (path to me) as string) & "Contents/Resources/"
+                       set theScript to thePath & theScript
+               end if
+               set theOutput to do shell script theScript as string
+               set the contents of text view 1 of scroll view 1 of window "debugWindow" to ""
+               set the contents of text view 1 of scroll view 1 of window "debugWindow" to theOutput
+       end if
+       
 end clicked
 
 
@@ -314,14 +327,21 @@ on convertFile(fileList)
        feedbackBusy(true)
        -- do the script
        set thePath to POSIX path of (path to me) as string
+       set theConvertScript to (quoted form of thePath & "Contents/Resources/gpsbabel" & fileText & " " & filterText & "-o " & outType & " -F " & quoted form of outputFile) as string
        try
-               set scriptOut to (do shell script quoted form of thePath & "Contents/Resources/gpsbabel" & fileText & " " & filterText & "-o " & outType & " -F " & quoted form of outputFile) as string
-               feedbackBusy(false)
-               display dialog "Conversion Complete" & return & scriptOut buttons {"OK"} default button 1
+               set scriptOut to do shell script theConvertScript as string
+               set convertYN to "Conversion Completed Successfully"
        on error
-               feedbackBusy(false)
-               display dialog "Conversion Failed" & return & scriptOut buttons {"OK"} default button 1
+               set scriptOut to "gpsbabel encountered an error"
+               set convertYN to "Conversion Failed!"
        end try
+       feedbackBusy(false)
+       display dialog convertYN buttons {"OK"} default button 1
+       if visible of window "debugWindow" is true then
+               set the contents of text view 1 of scroll view 1 of window "debugWindow" to ""
+               set the contents of text view 1 of scroll view 1 of window "debugWindow" to "MacGPSBabel Report" & return & return & "The Shell Script:" & return & theConvertScript & return & return & convertYN & return & return & "Output From gpsbabel:" & return & scriptOut
+       end if
+       my clearFiles()
 end convertFile
 
 -- GPS RECEIVER HANDLERS
@@ -515,19 +535,17 @@ on getFormats()
        set typeList to {}
        set extList to {}
        set thePath to POSIX path of (path to me) as string
-       set scriptOut to (do shell script quoted form of thePath & "Contents/Resources/gpsbabel -^") as string
+       set scriptOut to (do shell script quoted form of thePath & "Contents/Resources/gpsbabel -^1") as string
        set theCount to count of paragraphs in scriptOut
-       set i to 1
        set defaultDelimiters to AppleScript's text item delimiters
        set AppleScript's text item delimiters to tab
-       repeat until i = theCount + 1
+       repeat with i from 1 to theCount
                set theLine to paragraph i of scriptOut
-               if (first text item of theLine) is not equal to "xcsv" and (first text item of theLine) is not equal to "magellan" and (first text item of theLine) is not equal to "garmin" then
-                       set the end of typeList to the first text item of theLine
-                       set the end of extList to the second text item of theLine
+               if (first text item of theLine) is equal to "file" then
+                       set the end of typeList to the second text item of theLine
+                       set the end of extList to the third text item of theLine
                        set the end of myList to the last text item of theLine
                end if
-               set i to i + 1
        end repeat
        set AppleScript's text item delimiters to defaultDelimiters
        return myList
@@ -574,4 +592,15 @@ on feedbackBusy(yn)
                        stop progress indicator 1
                end if
        end tell
-end feedbackBusy
\ No newline at end of file
+end feedbackBusy
+
+on clearFiles()
+       set contents of text field "inputFile" of window "MacGPSBabel" to ""
+       set fileList to {}
+       set title of button "selectButton" of window "MacGPSBabel" to "Select File"
+       set enabled of button "sendButton" of window "MacGPSBabel" to false
+       set key equivalent of button "selectButton" of window "MacGPSBabel" to return
+       set enabled of button "clearButton" of window "MacGPSBabel" to false
+       set the contents of popup button "inPop" of window "MacGPSBabel" to 0
+       set the contents of popup button "outPop" of window "MacGPSBabel" to 0
+end clearFiles
\ No newline at end of file

diff --git a/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/jeremya.pbxuser b/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/jeremya.pbxuser
index 4e821479a5f9371e6b60904eece570cc3f2fbeff..cb19c46a38f5a3453d57c6f77aa978ca2e0f6375 100644 (file)
--- a/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/jeremya.pbxuser
+++ b/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/jeremya.pbxuser
@@ -13,28 +13,275 @@
                        DA206CF0015C4D9F03C91932,
                );
                perUserDictionary = {
-                       PBXPerProjectTemplateStateSaveDate = 98654285;
+                       PBXPerProjectTemplateStateSaveDate = 101524721;
+                       "PBXTemplateGeometry-F5314676015831810DCA290F" = {
+                               ContentSize = "{685, 434}";
+                               LeftSlideOut = {
+                                       Collapsed = NO;
+                                       Frame = "{{0, 23}, {685, 411}}";
+                                       Split0 = {
+                                               ActiveTab = 2;
+                                               Collapsed = NO;
+                                               Frame = "{{0, 0}, {685, 411}}";
+                                               Split0 = {
+                                                       Frame = "{{0, 221}, {685, 190}}";
+                                               };
+                                               SplitCount = 1;
+                                               Tab0 = {
+                                                       Debugger = {
+                                                               Collapsed = NO;
+                                                               Frame = "{{0, 0}, {952, 321}}";
+                                                               Split0 = {
+                                                                       Frame = "{{0, 24}, {952, 297}}";
+                                                                       Split0 = {
+                                                                               Frame = "{{0, 0}, {468, 297}}";
+                                                                       };
+                                                                       Split1 = {
+                                                                               DebugVariablesTableConfiguration = (
+                                                                                       Name,
+                                                                                       126.803,
+                                                                                       Value,
+                                                                                       150.074,
+                                                                                       Summary,
+                                                                                       172.123,
+                                                                               );
+                                                                               Frame = "{{477, 0}, {475, 297}}";
+                                                                       };
+                                                                       SplitCount = 2;
+                                                               };
+                                                               SplitCount = 1;
+                                                               Tab0 = {
+                                                                       Frame = "{{0, 0}, {100, 50}}";
+                                                               };
+                                                               Tab1 = {
+                                                                       Frame = "{{0, 0}, {100, 50}}";
+                                                               };
+                                                               TabCount = 2;
+                                                               TabsVisible = YES;
+                                                       };
+                                                       Frame = "{{0, 0}, {952, 321}}";
+                                                       LauncherConfigVersion = 7;
+                                               };
+                                               Tab1 = {
+                                                       Frame = "{{0, 0}, {781, 452}}";
+                                                       LauncherConfigVersion = 3;
+                                                       Runner = {
+                                                               Frame = "{{0, 0}, {781, 452}}";
+                                                       };
+                                               };
+                                               Tab2 = {
+                                                       BuildMessageFrame = "{{0, 0}, {687, 149}}";
+                                                       BuildTranscriptFrame = "{{0, 158}, {687, 59}}";
+                                                       Frame = "{{0, 0}, {685, 215}}";
+                                               };
+                                               Tab3 = {
+                                                       Frame = "{{0, 0}, {612, 295}}";
+                                               };
+                                               TabCount = 4;
+                                               TabsVisible = NO;
+                                       };
+                                       SplitCount = 1;
+                                       Tab0 = {
+                                               Frame = "{{0, 0}, {300, 533}}";
+                                               GroupTreeTableConfiguration = (
+                                                       SCMStatusColumn,
+                                                       22,
+                                                       TargetStatusColumn,
+                                                       18,
+                                                       MainColumn,
+                                                       245,
+                                               );
+                                       };
+                                       Tab1 = {
+                                               ClassesFrame = "{{0, 0}, {280, 398}}";
+                                               ClassesTreeTableConfiguration = (
+                                                       PBXBookColumnIdentifier,
+                                                       20,
+                                                       PBXClassColumnIdentifier,
+                                                       237,
+                                               );
+                                               Frame = "{{0, 0}, {278, 659}}";
+                                               MembersFrame = "{{0, 407}, {280, 252}}";
+                                               MembersTreeTableConfiguration = (
+                                                       PBXBookColumnIdentifier,
+                                                       20,
+                                                       PBXMethodColumnIdentifier,
+                                                       236,
+                                               );
+                                       };
+                                       Tab2 = {
+                                               Frame = "{{0, 0}, {200, 100}}";
+                                       };
+                                       Tab3 = {
+                                               Frame = "{{0, 0}, {200, 100}}";
+                                               TargetTableConfiguration = (
+                                                       ActiveObject,
+                                                       16,
+                                                       ObjectNames,
+                                                       202.296,
+                                               );
+                                       };
+                                       Tab4 = {
+                                               BreakpointsTreeTableConfiguration = (
+                                                       breakpointColumn,
+                                                       197,
+                                                       enabledColumn,
+                                                       31,
+                                               );
+                                               Frame = "{{0, 0}, {250, 100}}";
+                                       };
+                                       TabCount = 5;
+                                       TabsVisible = NO;
+                               };
+                               StatusViewVisible = YES;
+                               Template = F5314676015831810DCA290F;
+                               ToolbarVisible = YES;
+                               WindowLocation = "{7, 250}";
+                       };
+                       "PBXTemplateGeometry-F5534CB2020F3F8A0DCA290F" = {
+                               ContentSize = "{594, 303}";
+                               LeftSlideOut = {
+                                       Collapsed = NO;
+                                       Frame = "{{0, 23}, {594, 280}}";
+                                       Split0 = {
+                                               ActiveTab = 1;
+                                               Collapsed = YES;
+                                               Frame = "{{0, 0}, {594, 280}}";
+                                               Split0 = {
+                                                       Frame = "{{1e+06, 1e+06}, {594, 0}}";
+                                               };
+                                               SplitCount = 1;
+                                               Tab0 = {
+                                                       Debugger = {
+                                                               Collapsed = NO;
+                                                               Frame = "{{0, 0}, {804, 321}}";
+                                                               Split0 = {
+                                                                       Frame = "{{0, 24}, {804, 297}}";
+                                                                       Split0 = {
+                                                                               Frame = "{{0, 0}, {394, 297}}";
+                                                                       };
+                                                                       Split1 = {
+                                                                               DebugVariablesTableConfiguration = (
+                                                                                       Name,
+                                                                                       123,
+                                                                                       Value,
+                                                                                       85,
+                                                                                       Summary,
+                                                                                       167.123,
+                                                                               );
+                                                                               Frame = "{{403, 0}, {401, 297}}";
+                                                                       };
+                                                                       SplitCount = 2;
+                                                               };
+                                                               SplitCount = 1;
+                                                               Tab0 = {
+                                                                       Frame = "{{0, 0}, {100, 50}}";
+                                                               };
+                                                               Tab1 = {
+                                                                       Frame = "{{0, 0}, {100, 50}}";
+                                                               };
+                                                               TabCount = 2;
+                                                               TabsVisible = YES;
+                                                       };
+                                                       Frame = "{{0, 0}, {804, 321}}";
+                                                       LauncherConfigVersion = 7;
+                                               };
+                                               Tab1 = {
+                                                       Frame = "{{0, 0}, {594, 274}}";
+                                                       LauncherConfigVersion = 3;
+                                                       Runner = {
+                                                               Frame = "{{0, 0}, {594, 274}}";
+                                                       };
+                                               };
+                                               Tab2 = {
+                                                       BuildMessageFrame = "{{0, 0}, {806, 237}}";
+                                                       BuildTranscriptFrame = "{{0, 246}, {806, 3}}";
+                                                       Frame = "{{0, 0}, {804, 247}}";
+                                               };
+                                               Tab3 = {
+                                                       Frame = "{{0, 0}, {612, 295}}";
+                                               };
+                                               TabCount = 4;
+                                               TabsVisible = NO;
+                                       };
+                                       SplitCount = 1;
+                                       Tab0 = {
+                                               Frame = "{{0, 0}, {300, 533}}";
+                                               GroupTreeTableConfiguration = (
+                                                       SCMStatusColumn,
+                                                       22,
+                                                       TargetStatusColumn,
+                                                       18,
+                                                       MainColumn,
+                                                       245,
+                                               );
+                                       };
+                                       Tab1 = {
+                                               ClassesFrame = "{{0, 0}, {280, 398}}";
+                                               ClassesTreeTableConfiguration = (
+                                                       PBXBookColumnIdentifier,
+                                                       20,
+                                                       PBXClassColumnIdentifier,
+                                                       237,
+                                               );
+                                               Frame = "{{0, 0}, {278, 659}}";
+                                               MembersFrame = "{{0, 407}, {280, 252}}";
+                                               MembersTreeTableConfiguration = (
+                                                       PBXBookColumnIdentifier,
+                                                       20,
+                                                       PBXMethodColumnIdentifier,
+                                                       236,
+                                               );
+                                       };
+                                       Tab2 = {
+                                               Frame = "{{0, 0}, {200, 100}}";
+                                       };
+                                       Tab3 = {
+                                               Frame = "{{0, 0}, {200, 386}}";
+                                               TargetTableConfiguration = (
+                                                       ActiveObject,
+                                                       16,
+                                                       ObjectNames,
+                                                       202.296,
+                                               );
+                                       };
+                                       Tab4 = {
+                                               BreakpointsTreeTableConfiguration = (
+                                                       breakpointColumn,
+                                                       197,
+                                                       enabledColumn,
+                                                       31,
+                                               );
+                                               Frame = "{{0, 0}, {250, 386}}";
+                                       };
+                                       TabCount = 5;
+                                       TabsVisible = NO;
+                               };
+                               StatusViewVisible = YES;
+                               Template = F5534CB2020F3F8A0DCA290F;
+                               ToolbarVisible = YES;
+                               WindowLocation = "{4, 381}";
+                       };
                        PBXWorkspaceContents = (
                                {
                                        LeftSlideOut = {
                                                Split0 = {
                                                        Split0 = {
                                                                NavContent0 = {
-                                                                       bookmark = F5516AAD05E1AD5A017C67C1;
+                                                                       bookmark = F574F496060D2BB901A80065;
                                                                        history = (
-                                                                               F5F16EF60527D1B401A80064,
                                                                                F5E2D67E05CDA550017C67C1,
                                                                                F5E2D67F05CDA550017C67C1,
                                                                                F5E2D68005CDA550017C67C1,
                                                                                F5516A9D05E1AD5A017C67C1,
                                                                                F5516A9E05E1AD5A017C67C1,
                                                                                F5516A9F05E1AD5A017C67C1,
-                                                                               F5516AA005E1AD5A017C67C1,
-                                                                               F5516AA105E1AD5A017C67C1,
+                                                                               F5F411C605EEF803017C67C1,
+                                                                               F5EAB15305FF78D401A80065,
+                                                                               F5EAB15205FF78D401A80065,
                                                                        );
                                                                        prevStack = (
                                                                                F5F16EF80527D1B401A80064,
-                                                                               F5F16EF90527D1B401A80064,
                                                                                F54D1E350548BAC0017C67C1,
                                                                                F54D1E360548BAC0017C67C1,
                                                                                F54D1E370548BAC0017C67C1,
@@ -116,6 +363,10 @@
                                                                                F5516AAA05E1AD5A017C67C1,
                                                                                F5516AAB05E1AD5A017C67C1,
                                                                                F5516AAC05E1AD5A017C67C1,
+                                                                               F5F2761005EDB91901A80065,
+                                                                               F5F411C805EEF803017C67C1,
+                                                                               F5EAB15505FF78D401A80065,
+                                                                               F5EAB15605FF78D401A80065,
                                                                        );
                                                                };
                                                                NavCount = 1;
@@ -343,7 +594,7 @@
                                        StatusViewVisible = YES;
                                        Template = 64ABBB4501FA494900185B06;
                                        ToolbarVisible = YES;
-                                       WindowLocation = "{4, 0}";
+                                       WindowLocation = "{6, 0}";
                                },
                                {
                                        ContentSize = "{685, 434}";
@@ -415,12 +666,10 @@
                                                Tab0 = {
                                                        Frame = "{{0, 0}, {300, 533}}";
                                                        GroupTreeTableConfiguration = (
-                                                               SCMStatusColumn,
-                                                               22,
                                                                TargetStatusColumn,
                                                                18,
                                                                MainColumn,
-                                                               245,
+                                                               267,
                                                        );
                                                };
                                                Tab1 = {
@@ -539,12 +788,10 @@
                                                Tab0 = {
                                                        Frame = "{{0, 0}, {300, 533}}";
                                                        GroupTreeTableConfiguration = (
-                                                               SCMStatusColumn,
-                                                               22,
                                                                TargetStatusColumn,
                                                                18,
                                                                MainColumn,
-                                                               245,
+                                                               267,
                                                        );
                                                };
                                                Tab1 = {
@@ -594,7 +841,7 @@
                                        WindowLocation = "{4, 381}";
                                },
                        );
-                       PBXWorkspaceStateSaveDate = 98654285;
+                       PBXWorkspaceStateSaveDate = 101524721;
                };
                perUserProjectItems = {
                        F508F40305A7AE8A01A80064 = F508F40305A7AE8A01A80064;
@@ -622,8 +869,6 @@
                        F5516A9D05E1AD5A017C67C1 = F5516A9D05E1AD5A017C67C1;
                        F5516A9E05E1AD5A017C67C1 = F5516A9E05E1AD5A017C67C1;
                        F5516A9F05E1AD5A017C67C1 = F5516A9F05E1AD5A017C67C1;
-                       F5516AA005E1AD5A017C67C1 = F5516AA005E1AD5A017C67C1;
-                       F5516AA105E1AD5A017C67C1 = F5516AA105E1AD5A017C67C1;
                        F5516AA205E1AD5A017C67C1 = F5516AA205E1AD5A017C67C1;
                        F5516AA305E1AD5A017C67C1 = F5516AA305E1AD5A017C67C1;
                        F5516AA405E1AD5A017C67C1 = F5516AA405E1AD5A017C67C1;
@@ -635,7 +880,6 @@
                        F5516AAA05E1AD5A017C67C1 = F5516AAA05E1AD5A017C67C1;
                        F5516AAB05E1AD5A017C67C1 = F5516AAB05E1AD5A017C67C1;
                        F5516AAC05E1AD5A017C67C1 = F5516AAC05E1AD5A017C67C1;
-                       F5516AAD05E1AD5A017C67C1 = F5516AAD05E1AD5A017C67C1;
                        F554DF6805AE715801A80064 = F554DF6805AE715801A80064;
                        F554DF6905AE715801A80064 = F554DF6905AE715801A80064;
                        F554DF6A05AE715801A80064 = F554DF6A05AE715801A80064;
@@ -645,6 +889,7 @@
                        F557060A05C8B0C0017C67C1 = F557060A05C8B0C0017C67C1;
                        F557060B05C8B0C0017C67C1 = F557060B05C8B0C0017C67C1;
                        F557060C05C8B0C0017C67C1 = F557060C05C8B0C0017C67C1;
+                       F574F496060D2BB901A80065 = F574F496060D2BB901A80065;
                        F586ED0705CC1ED5017C67C1 = F586ED0705CC1ED5017C67C1;
                        F586ED0805CC1ED5017C67C1 = F586ED0805CC1ED5017C67C1;
                        F586ED0905CC1ED5017C67C1 = F586ED0905CC1ED5017C67C1;
@@ -687,9 +932,14 @@
                        F5E2D68605CDA550017C67C1 = F5E2D68605CDA550017C67C1;
                        F5E67E8505DFEBAB017C67C1 = F5E67E8505DFEBAB017C67C1;
                        F5E67E8605DFEBAB017C67C1 = F5E67E8605DFEBAB017C67C1;
-                       F5F16EF60527D1B401A80064 = F5F16EF60527D1B401A80064;
+                       F5EAB15205FF78D401A80065 = F5EAB15205FF78D401A80065;
+                       F5EAB15305FF78D401A80065 = F5EAB15305FF78D401A80065;
+                       F5EAB15505FF78D401A80065 = F5EAB15505FF78D401A80065;
+                       F5EAB15605FF78D401A80065 = F5EAB15605FF78D401A80065;
                        F5F16EF80527D1B401A80064 = F5F16EF80527D1B401A80064;
-                       F5F16EF90527D1B401A80064 = F5F16EF90527D1B401A80064;
+                       F5F2761005EDB91901A80065 = F5F2761005EDB91901A80065;
+                       F5F411C605EEF803017C67C1 = F5F411C605EEF803017C67C1;
+                       F5F411C805EEF803017C67C1 = F5F411C805EEF803017C67C1;
                };
                projectwideBuildSettings = {
                };
@@ -723,7 +973,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 480";
                rLen = 0;
-               rLoc = 5119;
+               rLoc = 4628;
                rType = 0;
                vrLen = 2445;
                vrLoc = 5977;
@@ -757,7 +1007,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 564";
                rLen = 0;
-               rLoc = 25035;
+               rLoc = 26258;
                rType = 0;
                vrLen = 1497;
                vrLoc = 0;
@@ -797,7 +1047,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 328";
                rLen = 0;
-               rLoc = 15192;
+               rLoc = 16002;
                rType = 0;
                vrLen = 1498;
                vrLoc = 0;
@@ -811,7 +1061,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 480";
                rLen = 0;
-               rLoc = 5119;
+               rLoc = 4628;
                rType = 0;
                vrLen = 1744;
                vrLoc = 189;
@@ -821,7 +1071,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 190";
                rLen = 0;
-               rLoc = 5119;
+               rLoc = 4628;
                rType = 0;
                vrLen = 1958;
                vrLoc = 8259;
@@ -831,7 +1081,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 188";
                rLen = 0;
-               rLoc = 5119;
+               rLoc = 4628;
                rType = 0;
                vrLen = 2222;
                vrLoc = 8371;
@@ -841,7 +1091,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 434";
                rLen = 0;
-               rLoc = 5119;
+               rLoc = 4628;
                rType = 0;
                vrLen = 1792;
                vrLoc = 0;
@@ -869,7 +1119,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 434";
                rLen = 0;
-               rLoc = 5119;
+               rLoc = 4628;
                rType = 0;
                vrLen = 1792;
                vrLoc = 0;
@@ -883,7 +1133,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 193";
                rLen = 0;
-               rLoc = 5119;
+               rLoc = 4628;
                rType = 0;
                vrLen = 1413;
                vrLoc = 2970;
@@ -915,20 +1165,6 @@
        F5516A9E05E1AD5A017C67C1 = {
                isa = PBXTargetBookmark;
                trg = 29B97326FDCFA39411CA2CEA;
-               uiCtxt = {
-                       TOCViewDetailVisibleRect = "{{0, 0}, {591, 147}}";
-                       TOCViewExpandedItems = (
-                               "com.apple.target-editor-pane.settings",
-                               "com.apple.target-editor-pane.settings.simple",
-                               "com.apple.target-editor-pane.info-plist",
-                               "com.apple.target-editor-pane.info-plist.simple",
-                               "com.apple.target-editor-pane.buildphases",
-                       );
-                       TOCViewMasterVisibleRect = "{{0, 0}, {234, 607}}";
-                       TOCViewSelectedItems = (
-                               PBXProductBasicSettingsModule,
-                       );
-               };
        };
        F5516A9F05E1AD5A017C67C1 = {
                fRef = F508F3FF05A7A82F01A80064;
@@ -940,26 +1176,6 @@
                vrLen = 1400;
                vrLoc = 0;
        };
-       F5516AA005E1AD5A017C67C1 = {
-               fRef = F586ED0005CB576C017C67C1;
-               isa = PBXTextBookmark;
-               name = "preferences.applescript: 12";
-               rLen = 0;
-               rLoc = 546;
-               rType = 0;
-               vrLen = 2103;
-               vrLoc = 0;
-       };
-       F5516AA105E1AD5A017C67C1 = {
-               fRef = DA206CF3015C4E8B03C91932;
-               isa = PBXTextBookmark;
-               name = "MacGPSBabel.applescript: 568";
-               rLen = 0;
-               rLoc = 24873;
-               rType = 0;
-               vrLen = 2008;
-               vrLoc = 23011;
-       };
        F5516AA205E1AD5A017C67C1 = {
                fRef = F586ED0005CB576C017C67C1;
                isa = PBXTextBookmark;
@@ -1033,20 +1249,6 @@
        F5516AA905E1AD5A017C67C1 = {
                isa = PBXTargetBookmark;
                trg = 29B97326FDCFA39411CA2CEA;
-               uiCtxt = {
-                       TOCViewDetailVisibleRect = "{{0, 0}, {591, 147}}";
-                       TOCViewExpandedItems = (
-                               "com.apple.target-editor-pane.settings",
-                               "com.apple.target-editor-pane.settings.simple",
-                               "com.apple.target-editor-pane.info-plist",
-                               "com.apple.target-editor-pane.info-plist.simple",
-                               "com.apple.target-editor-pane.buildphases",
-                       );
-                       TOCViewMasterVisibleRect = "{{0, 0}, {234, 607}}";
-                       TOCViewSelectedItems = (
-                               PBXProductBasicSettingsModule,
-                       );
-               };
        };
        F5516AAA05E1AD5A017C67C1 = {
                fRef = F508F3FF05A7A82F01A80064;
@@ -1063,9 +1265,9 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 568";
                rLen = 0;
-               rLoc = 24873;
+               rLoc = 25536;
                rType = 0;
-               vrLen = 2008;
+               vrLen = 1904;
                vrLoc = 23011;
        };
        F5516AAC05E1AD5A017C67C1 = {
@@ -1078,22 +1280,12 @@
                vrLen = 2103;
                vrLoc = 0;
        };
-       F5516AAD05E1AD5A017C67C1 = {
-               fRef = DA206CF3015C4E8B03C91932;
-               isa = PBXTextBookmark;
-               name = "MacGPSBabel.applescript: 577";
-               rLen = 0;
-               rLoc = 25035;
-               rType = 0;
-               vrLen = 2008;
-               vrLoc = 23011;
-       };
        F554DF6805AE715801A80064 = {
                fRef = DA206CF3015C4E8B03C91932;
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 499";
                rLen = 0;
-               rLoc = 5119;
+               rLoc = 4628;
                rType = 0;
                vrLen = 1552;
                vrLoc = 0;
@@ -1117,7 +1309,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 499";
                rLen = 0;
-               rLoc = 5119;
+               rLoc = 4628;
                rType = 0;
                vrLen = 1552;
                vrLoc = 0;
@@ -1131,7 +1323,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 554";
                rLen = 0;
-               rLoc = 25035;
+               rLoc = 26258;
                rType = 0;
                vrLen = 1511;
                vrLoc = 14316;
@@ -1160,12 +1352,22 @@
                vrLen = 275;
                vrLoc = 0;
        };
+       F574F496060D2BB901A80065 = {
+               fRef = DA206CF3015C4E8B03C91932;
+               isa = PBXTextBookmark;
+               name = "MacGPSBabel.applescript: 606";
+               rLen = 0;
+               rLoc = 26258;
+               rType = 0;
+               vrLen = 1798;
+               vrLoc = 9262;
+       };
        F586ED0705CC1ED5017C67C1 = {
                fRef = DA206CF3015C4E8B03C91932;
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 556";
                rLen = 0;
-               rLoc = 25035;
+               rLoc = 26258;
                rType = 0;
                vrLen = 1495;
                vrLoc = 0;
@@ -1185,7 +1387,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 245";
                rLen = 0;
-               rLoc = 12620;
+               rLoc = 12962;
                rType = 0;
                vrLen = 1811;
                vrLoc = 11141;
@@ -1205,7 +1407,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 245";
                rLen = 0;
-               rLoc = 12620;
+               rLoc = 12962;
                rType = 0;
                vrLen = 1795;
                vrLoc = 11141;
@@ -1225,7 +1427,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 245";
                rLen = 0;
-               rLoc = 12620;
+               rLoc = 12962;
                rType = 0;
                vrLen = 1773;
                vrLoc = 9896;
@@ -1245,7 +1447,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 528";
                rLen = 1109;
-               rLoc = 23168;
+               rLoc = 23831;
                rType = 0;
                vrLen = 2083;
                vrLoc = 20945;
@@ -1265,7 +1467,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 543";
                rLen = 543;
-               rLoc = 24278;
+               rLoc = 24941;
                rType = 0;
                vrLen = 2083;
                vrLoc = 20945;
@@ -1285,7 +1487,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 557";
                rLen = 0;
-               rLoc = 25035;
+               rLoc = 26258;
                rType = 0;
                vrLen = 1436;
                vrLoc = 21697;
@@ -1299,7 +1501,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 564";
                rLen = 161;
-               rLoc = 24874;
+               rLoc = 25537;
                rType = 0;
                vrLen = 1973;
                vrLoc = 22760;
@@ -1319,7 +1521,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 577";
                rLen = 0;
-               rLoc = 25035;
+               rLoc = 26258;
                rType = 0;
                vrLen = 1728;
                vrLoc = 16243;
@@ -1339,7 +1541,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 577";
                rLen = 0;
-               rLoc = 25035;
+               rLoc = 26258;
                rType = 0;
                vrLen = 1774;
                vrLoc = 13079;
@@ -1379,7 +1581,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 318";
                rLen = 0;
-               rLoc = 15192;
+               rLoc = 16002;
                rType = 0;
                vrLen = 1766;
                vrLoc = 13015;
@@ -1409,7 +1611,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 556";
                rLen = 0;
-               rLoc = 25035;
+               rLoc = 26258;
                rType = 0;
                vrLen = 1497;
                vrLoc = 0;
@@ -1439,7 +1641,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 572";
                rLen = 0;
-               rLoc = 25035;
+               rLoc = 26258;
                rType = 0;
                vrLen = 2257;
                vrLoc = 782;
@@ -1459,7 +1661,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 572";
                rLen = 0;
-               rLoc = 25035;
+               rLoc = 26258;
                rType = 0;
                vrLen = 2240;
                vrLoc = 332;
@@ -1500,7 +1702,7 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 577";
                rLen = 0;
-               rLoc = 25035;
+               rLoc = 26258;
                rType = 0;
                vrLen = 1728;
                vrLoc = 16243;
@@ -1587,29 +1789,77 @@
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 562";
                rLen = 0;
-               rLoc = 24821;
+               rLoc = 25484;
                rType = 0;
                vrLen = 1973;
                vrLoc = 22760;
        };
-       F5F16EF60527D1B401A80064 = {
-               fRef = DA206CF4015C4E8B03C91932;
-               fallbackIsa = PBXBookmark;
-               isa = ASKDictionaryBookmark;
+       F5EAB15205FF78D401A80065 = {
+               fRef = DA206CF3015C4E8B03C91932;
+               isa = PBXTextBookmark;
+               name = "MacGPSBabel.applescript: 518";
+               rLen = 0;
+               rLoc = 22696;
+               rType = 0;
+               vrLen = 1965;
+               vrLoc = 21930;
+       };
+       F5EAB15305FF78D401A80065 = {
+               fRef = F52E6CB4059959B801A80064;
+               isa = PBXBookmark;
+       };
+       F5EAB15505FF78D401A80065 = {
+               fRef = DA206CF3015C4E8B03C91932;
+               isa = PBXTextBookmark;
+               name = "MacGPSBabel.applescript: 518";
+               rLen = 0;
+               rLoc = 22696;
+               rType = 0;
+               vrLen = 1965;
+               vrLoc = 21930;
+       };
+       F5EAB15605FF78D401A80065 = {
+               fRef = F52E6CB4059959B801A80064;
+               isa = PBXBookmark;
        };
        F5F16EF80527D1B401A80064 = {
                fRef = DA206CF3015C4E8B03C91932;
                isa = PBXTextBookmark;
                name = "MacGPSBabel.applescript: 111";
                rLen = 0;
-               rLoc = 5119;
+               rLoc = 4628;
                rType = 0;
                vrLen = 1256;
                vrLoc = 3068;
        };
-       F5F16EF90527D1B401A80064 = {
-               fRef = DA206CF4015C4E8B03C91932;
-               fallbackIsa = PBXBookmark;
-               isa = ASKDictionaryBookmark;
+       F5F2761005EDB91901A80065 = {
+               fRef = DA206CF3015C4E8B03C91932;
+               isa = PBXTextBookmark;
+               name = "MacGPSBabel.applescript: 575";
+               rLen = 0;
+               rLoc = 26258;
+               rType = 0;
+               vrLen = 2154;
+               vrLoc = 21908;
+       };
+       F5F411C605EEF803017C67C1 = {
+               fRef = F586ED0005CB576C017C67C1;
+               isa = PBXTextBookmark;
+               name = "preferences.applescript: 101";
+               rLen = 0;
+               rLoc = 4270;
+               rType = 0;
+               vrLen = 1911;
+               vrLoc = 4192;
+       };
+       F5F411C805EEF803017C67C1 = {
+               fRef = F586ED0005CB576C017C67C1;
+               isa = PBXTextBookmark;
+               name = "preferences.applescript: 101";
+               rLen = 0;
+               rLoc = 4270;
+               rType = 0;
+               vrLen = 1911;
+               vrLoc = 4192;
        };
 }

diff --git a/gpsbabel/macgpsbabel/README.macgpsbabel b/gpsbabel/macgpsbabel/README.macgpsbabel
index 621bc5b1ca27f189af966a0447fbdb123d74600f..e4d7ee8489a409eda9467be1c53ad0519cfae481 100644 (file)
--- a/gpsbabel/macgpsbabel/README.macgpsbabel
+++ b/gpsbabel/macgpsbabel/README.macgpsbabel
@@ -2,4 +2,7 @@ MacGPSBabel is a Mac OS X GUI front-end for gpsbabel. The GUI was developed usin
 
 Build instructions.
 
-MacGPSBabel can be built with Apple's developer tools in the same way that you would build any other application. As it is, the Project Builder will assume that you have added a build of gpsbabel into the same folder as the rest of the MacGPSBabel project files. This binary will then be embedded in the build of MacGPSBabel. If you do not do this then MacGPSBabel will not work, however, it is possible to place the gpsbabel binary into the Resources Folder in the MacGPSBabel package after building it.
\ No newline at end of file
+MacGPSBabel can be built with Apple's developer tools in the same way that you would build any other application. As it is, the Project Builder will assume that you have added a build of gpsbabel into the same folder as the rest of the MacGPSBabel project files. This binary will then be embedded in the build of MacGPSBabel. If you do not do this then MacGPSBabel will not work, however, it is possible to place the gpsbabel binary into the Resources Folder in the MacGPSBabel package after building it.
+
+Debug (verbose) Mode
+This can be activated by pressing command-option-v whilst the main MacGPSBabel window is the active window. When debug mode is active, using MacGPSBabel in the usual manner will result in a report for each file conversion being displayed in the debug window. Alternatively, commands can be typed directly in the debug window and run using the 'execute' button (the full path to any file needs to be specified).
\ No newline at end of file